Merge pull request #35 from mmmaisel/cmake