Merge pull request #153 from forumbyr/master

	as query input
Merge pull request #8 from cnnic/master

m
modify dao
Merge pull request #154 from larrychen8276/master

modify dao
Merge pull request #16 from cnnic/master

merge from cnnic