Merge pull request #20 from tienvx/features/field-group-support

Features/field group support