Merge pull request #1 from yanxi-com/yanxi

Indentation with 4 whitespaces
Merge pull request #2 from yanxi-com/yanxi

Yanxi
bug fix: return after callback(err)