Merge pull request #20 from LocalData/api-change

Update to match API changes
Merge branch 'master' into offline