closed #1493
add EventManager
Merge branch 'master' into dev
small fix