Tidy up on addon namings
Merged begin and keyword logic in tag addon
Merge pull request #165 from lyncodev/addon-naming-tidy-up

Tidy up on addon namings