Merge pull request #214 from erwincoumans/master

fix Linux  and Cmake build
fix mac build