work on #392
API returns promises, closes #392
Merge remote-tracking branch 'origin/master'