Merge pull request #136 from digawp/datastore-api
Proposed Datastore API

(main@d902d876b2b817bf1a031160099ef48d32dbdf42)