Added support for subtopics in the plugin close #59 and fixed errors close #60
Merged from master