A few bugfixes in the build system
Merge branch 'pure'
Trying out loading extra options in C++