correct use EventDispatcher
Merge branch 'issue-10' into develop