Merge pull request #61 from chrisdutz/feature/updated-cmake

Feature/updated cmake