adding stop/start features
Merge remote-tracking branch 'origin/master'