Build system fixes
Merge branch 'pure'
Trying out loading extra options in C++