Groovy migration
Merge pull request #27 from ipa-nhg/groovy_dev

New branch groovy_dev