Merge pull request #31 from detunized/master

Fix compilation on OS X