making things compile on osx
Merging in the master
Merge branch 'master' of https://github.com/furgalep/Schweizer-Messer
Updated to compile on osx