fixed(i hope) the state machine
Merge pull request #56 in CHSBNDL/chaosframework from fix_init_deinit_start_stop_machine to development

* commit 'a3bb5330bb43698a5780568a2db8394ca85293f6':
  fixed(i hope) the state machine