Merge pull request #19 from ipa-mig/groovy_dev

fixes optimization bug