OS X.10 support
Merge pull request #506 from hashdist/ahmadia/osx_10_support

OS X.10 support