Merge pull request #56 from Eyescale/master

Fix OS X build