Support start and stop buttons
Merge branch 'develop'