Merge pull request #36 from dpjudas/master

Fixes building on OS X