Merge pull request #11 from valgit/master

cleanup compilation for OSX