Partial OS X build fix
Merge pull request #50 from Eyescale/master

partial build fix