Merge pull request #10 from friends110110/master

Query has all complete,later do setting
Merge pull request #1 from JarvisChu/master

receive #10 from JarvisChu