minor code polishing
Merge branch 'master' of https://github.com/LukeLukasson/dyn_mapping