Merge pull request #1 from alexliu88/master

from bluebird
...
nimei
Merge pull request #2 from coolbluebird/master

you sister two