Few fixes for Linux
Merge pull request #4 from procedural/fixes

Few fixes for Linux