OS X fixes
Merge pull request #10 from DeVaukz/develop

OS X fixes