Merge pull request #15 from lmivan/master

Groovy improvements