Tilrettelser jf. Dokumentation af MappingScheme
Merge remote-tracking branch 'origin/master'