Fixing repeating fields

Certain repeating fields had the same name and was causing problems
Merge pull request #222 from Xphile101361/master

Fixing repeating fields