Merge pull request #396 from xor-gate/cmake-fixes