Merge pull request #2 from vikinghug/development

Development
Merge pull request #1 from vikinghug/master

Upstream update
Removed Viking from a registerEvent and fixed the not showing issue
Merge pull request #3 from Crowdedlight/master

Removed Viking from RegisterEvent. Fixed issue