Merge branch 'issue/27' into 'master'

Issue #27: Fix count aggregation

See merge request !19
1 job for master in 43 seconds (queued for 4 seconds)