Merge pull request #239 from retro-wertz/osx