updates for query
Merge pull request #6 from ichibangaijin/master

updates for query