Changed namespaces to be consistent.
Changed datastore implementation
Merge pull request #1 from mivano/develop

Changed datastore to actual save and retrieve items.