Merge pull request #9 from cyrille-leclerc/master

fix bug + introduce query.type (gauge, counter, ...) for future futures