Added some events.
Merge branch 'master' of https://github.com/Maplenormandy/mitsim2014