Fixed some compilation errors on osx
Merge pull request #125 from DavidPartouche/fix_osx_errors

Fixed some compilation errors on osx