merged the fork with the meter unit in the project

Hi, 
I just merged the branch with the optional meter unit support in yours.
It is tested with the leaflet 0.6.2.

bye
Karsten