Merge pull request #242 from jossgray/master

Fix build on osx