Merge pull request #26 from cnnic/dev

merge from cnnic
fix bug: help query.
Merge pull request #501 from forumbyr/master

fix bug: help query.