Merge pull request #5 from ipa-mig/groovy_dev

clean up and dependency resolving