fix #5: Compile error on groovy, bullet port to tf
Merge branch 'groovy-devel' into develop