canvas map
Merge pull request #2 from benheb/master

canvas map