Some fixes for Linux compatibility
Merge pull request #15 from brousch/master

Some fixes for Linux compatibility