Changing state to isRunning.
Simplifying eventID
Merge branch 'modularisation' into gh-pages

* modularisation:
  Simplifying eventID
  Changing state to isRunning.