Merge pull request #1 from xeno-by/master

fixes the build
Works on the simplified example, but still getting some errors. Investigating.
Well, that seems to fix it.