dynamic handling of services
Merge branch 'master' of github.com:Kokathon/Watch-on