Merge pull request #151 from jibsen/update-cmake

Update CMake script