Improves the save procedure of the local register mapping.
Merge pull request #251 from MarcMil/develop

Improves the save procedure of the local register mapping.