Merge pull request #90 from eile/master

Fix #88
Fix OSX downstream projects
Merge pull request #91 from tribal-tec/master

Fix OSX downstream projects
Update generated files