Merge branch 'issue/90' into 'develop'

Issue #90: Add class Query

See merge request !78
4 jobs for develop in 1 minute (queued for 2 seconds)