Added basic grouping
v0.4.0