Implemented events (#5)
Merge branch 'master' into gh-pages