Fix the maps size
Merge branch 'development'