Fixes #4 Fixes #6 by merging in updates from ctoestreich to fix problem with Rhino-based compilation under Grails 2.2