Merge pull request #1 from yahoo/master

sync with upstream
fix UT error
Merge pull request #3 from Yujun-Qian/master

tests unstable, need to call main's cb()?