Merge pull request #5 from ipa320/groovy_dev

merging ipa320 to ipa-fmw
Merge pull request #34 from ipa-fmw/groovy_dev

merging ipa-fmw to ipa320