Merge pull request #1 from BigNoid/master

Rebase
Split service and plugin code
Merge pull request #10 from unfledged/master

Split code for service and plugin elements of script