Merge pull request #43 from MaskRay/cmake