temporary map revert
Merge branch 'improvements' into gh-pages