Merge 9ae793555985429f6093236d526b5526212a206c into 89f83e733c4710d533dd277293ba08f559a2d645
embellishment new style Leaflet v0.5
merge with Andreas changes