Merge pull request #1 from hussani/develop

Changes on default public API and implementation of concrete ApiQuery class