Compatibility with all OS
Merge pull request #125 from jhonmike/master

Compatibility with all OS