Merge pull request #3 from TCB-Developers/master

accidental merge
more leaflet integration
merge message
Merge pull request #4 from TCB-Developers/dev

Dev