Ugly but working basic map
Merge branch 'master' into gh-pages