Bugfixes for Mac OS X, etc.
Merge pull request #88 from g-nix/master

Bugfixes for Mac OS X, etc.