Fix the map size;
Merge branch 'development'