Use pretttier map
Merge branch 'release/0.1.2' into gh-pages