moved event comment under event
Merge branch 'dev'