Merge pull request #27 from xoppa/master

Check mac build
Fix mac build (again)