OS X update
Merge pull request #11 from penguinflyer5234/osx

OS X update