Map aliasing
Merge branch 'master' of https://github.com/margaritaG/testingtool.git