Merge pull request #1 from blootsvoets/master

Fix OS X compilation