things are working rather properly
Merge branch 'leaflet'