Add support for groups
Bump up version nmber