Implemented Leaflet. Fixes #2