Fix tiles height
Merge branch 'master' into vasea