Merge pull request #45 from ichizok/fix/solaris

Fix solaris support