added mappings function, added gsim and ddi 3.2
Merge origin/master