for xml charset and bug of "Incorrect NumInGroup"

for "Incorrect NumInGroup" https://github.com/quickfixgo/quickfix/issues/366 https://github.com/quickfixgo/quickfix/issues/365

for xml charset: https://github.com/quickfixgo/quickfix/issues/363

datadictionary/datadictionary.go

@@ -3,6 +3,7 @@ package datadictionary
 
 import (
 	"encoding/xml"
+	"io"
 	"os"
 )
 
@@ -326,6 +327,9 @@ func Parse(path string) (*DataDictionary, error) {
 
 	doc := new(XMLDoc)
 	decoder := xml.NewDecoder(xmlFile)
+	decoder.CharsetReader = func(encoding string, input io.Reader) (io.Reader, error) {
+		return input, nil
+	}
 	if err := decoder.Decode(doc); err != nil {
 		return nil, err
 	}

validation.go

@@ -10,15 +10,14 @@ type validator interface {
 
 type validatorSettings struct {
 	CheckFieldsOutOfOrder bool
-	RejectInvalidMessage bool
-
+	RejectInvalidMessage  bool
 }
 
 //Default configuration for message validation.
 //See http://www.quickfixengine.org/quickfix/doc/html/configuration.html.
 var defaultValidatorSettings = validatorSettings{
 	CheckFieldsOutOfOrder: true,
-	RejectInvalidMessage: true,
+	RejectInvalidMessage:  true,
 }
 
 type fixValidator struct {
@@ -87,8 +86,6 @@ func validateFIX(d *datadictionary.DataDictionary, settings validatorSettings, m
 		}
 	}
 
-
-
 	return nil
 }
 
@@ -215,6 +212,7 @@ func validateVisitGroupField(fieldDef *datadictionary.FieldDef, fieldStack []Tag
 			if childDefs[0].Required() {
 				return fieldStack, RequiredTagMissing(Tag(childDefs[0].Tag()))
 			}
+			fieldStack = fieldStack[1:]
 		}
 
 		childDefs = childDefs[1:]