merge smap
Merge branch 'master' of https://github.com/thibautha/DatavizH3