Changed uniqueness criterion of events
Merge branch 'james_branch_2' into dev