events
making reset consisten.
Merge branch 'v1.0' into gh-pages
add