callbacks should resolve with a value if they get one
1.2.1
Merge branch 'master' into gh-pages
Update docs