bug fix
Merge branch 'master_events'