updates data
Makes events listened events configurable
Merge branch 'master' into gh-pages
Build