some mac osx fixes
Merge pull request #77 from da2ce7/master

Some mac osx fixes