Compile fixes for OSX moved
Merge pull request #2 from tsparber/master

 move compile fixes for OSX