updated to compile with osx
Merge pull request #1 from shawnrice/master

updated to compile with osx