Added support for multiple groups - for #92