Made some minor modifications to the temporary map
Merge branch 'hotfix/0.4.1'