Improve OSX compatibility
Merge pull request #5 from my-personal-forks/fixes-osx

Improve OSX compatibility