add annotate-class-id
Merge branch 'master' into TANAL-65