fix for local use of datastore api
Merge pull request #38 from wardi/canada-v2.0

fix for local use of datastore api