Merge pull request #4 from ipa320/groovy_dev

Upstream changes
Fixed small typo
Merge pull request #150 from abubeck/groovy_dev

Fixed small raw3-1 issue