Update CMake subtree and generated files
Merge pull request #16 from eile/master

Update CMake subtree and generated files