Merge pull request #84 from murrekatt/develop

CMake minor cleanups.