UPDATE to bluebird
Update Doc
Merge branch 'toBluebird' into develop