Merge pull request #24 from gavanderhoorn/groovy-devel

Merge private development branch
Merge pull request #33 from gavanderhoorn/groovy-devel

Fixes for 28, 29 and 31. Some other small fixes.