Merge pull request #26 from xoppa/master

Fix includes
Check mac build