Merge pull request #13 from kneemer/leaflet-1.0

Leaflet 1.0