Updating to r4
Fix MemoryStore class name
Merge branch 'pr/6'

closes #6