Merge pull request #16 from progtologist/master

Cleaning up for groovy branch