Merge pull request #15 from cnnic/master

merge from cnnic
as query input
Merge pull request #153 from forumbyr/master

	as query input