geozone + map refact
Merge branch 'master' of github.com:pug-by/project1