Merge pull request #56 from 130s/groovy-devel

Fix to #23, #46
Update CHANGELOG.rst for 0.2.11