Merge pull request #571 from azrin1972/BugFix--Exception-upon-startup

BugFix: move event to the top of the list of creation
Merge branch 'master' into Calibration-Update