Simple in-memory data store
Merge branch 'in-memory-store'