working map
good to go
Merge pull request #8 from econ24/master

good to deploy on lor