tweaks to use do api v2
Merge branch 'master' into gh-pages

* master:
  tweaks to use do api v2