Toggle run/stop
resolve step conflicts
Merge pull request #104 from TheSwanFactory/stop-events

Stop events