remove 'main thread' restrictions
Merge branch 'master' into public
remove old unnecessary code :)
check for stop service
Merge branch 'master' into public