Merge commit
#41 few fixes on EventController