Merge pull request #14 from cnnic/master

merge from cnnic
fix bug ns query
Merge pull request #140 from forumbyr/master

fix bug ns query