Fixed a bug with event persistence
Merge branch 'gh-pages' into phase-2