Leaflet (fixes #8)