Fully remove sketchy code
Update plugin.yml
small fixes
Merge pull request #1 from Electroid/master

Small bug/technical changes