Merge pull request #99 from jitlogic/dev1

Get rid of collector code (will b e developed as separate package).
Fixes for standard template for JVM.