Merge pull request #15 from ipa-mig/groovy_dev

CMakeLists stuff