Merge pull request #656 from stianst/master

Fixes to event-store-mem example
Merge pull request #657 from stianst/master

Various fixes