Fixed map size
Merge branch 'master' into gh-pages
new version
merge resolve