Fixed event binding bug
Merge branch 'dev'