Add querying class
Merge branch 'master' of github.com:Mishu/Shiretii