update

update
Merge remote-tracking branch 'origin/deffered/promise'