Merge branch 'hotfix/0.2.4'
Merge branch 'release/0.3.0'
Merge branch 'release/0.4.0'
Made some minor modifications to the temporary map
Merge branch 'hotfix/0.4.1' into develop