Feature/513 stopstart 2

Fixes #734