Test cmake

Merges master branch into this PR.