Fix #203 add group feature