Return correct promise in error case
Update documentation to make returned promises clearer
Merge branch 'master' into gh-pages
Fix promise documentation
Merge branch 'master' into gh-pages
rebuild docs