merge
fix some bugs in google data store code