refactored defaut map width and heigth
Merge remote-tracking branch 'origin/master'