taking changes from 1.2 to stop service
Merge pull request #2 from dileepbapat/master

taking changes from 1.2 to stop service