Merge pull request #50 from ipa-fxm/groovy_dev

Some fixes