Fix to #23, #46
Merge pull request #56 from 130s/groovy-devel

Fix to #23, #46