Improve Linux compatibility
Merge pull request #20 from Churten/master

Improve Linux compatibility