Merge pull request #348 from cheshirekow/cmake_build