bugfix handling unsubscribes via MC; comment fixes and tpl update
Merge pull request #89 from artfulrobot/master

bugfix handling unsubscribes via MC; comment fixes and tpl update