Merge pull request #10 from MarvinT/dev

run_state_machine more robust to errors
we don't need this anymore
Merge remote-tracking branch 'upstream/dev' into dev