BUG-9: kaifengz
Merge pull request #10 from kaifengz/kaifengz-again

Kaifengz again