rebuilding osx version (and fixing small errors)
Merge pull request #8 from jcjohnson/master

rebuilding osx version (and fixing small errors)