Changes to compile on Mac OS X
Merge pull request #2 from grosshei/master

Changes to compile on Mac OS X