Make the code more clean.
Merge pull request #26 from zhouguangfu/master

Make the code more clean.