bugfix customize events
*
Merge branch 'dev'