Merge pull request #4 from adam-vessey/7.x

Squash warning/not lie about the mapping being optional.
Safer checking for fields, and repeat fields with a single occurence.