new map handling
Merge branch 'master' of https://github.com/diana-stancheva/TomasHardy.git