Re-add fix for OSX Mavericks
Merge pull request #29 from bezoerb/#21

Re-add fix for OSX Mavericks