Merge pull request #11 from cnnic/dev

Dev
Merge pull request #12 from cnnic/dev

Dev
unit test problem.
unit test problem - add comments.
Merge pull request #144 from forumbyr/master

fix unit test problem.