Merge pull request #1 from greystate/make-it-work-on-osx

Make it work on OS X