Merge pull request #350 from cheshirekow/cmake_build