revi
Merge pull request #3 from kviksilver/zhong

revi
resolved conflicts