Changes for compilation on osx
Merge pull request #11 from ethz-asl/feature/compile-osx

Changes for compilation on osx