Better API query class.
Renamed query on model.
Merge branch 'master' into gh-pages
Doc.