Off-by-one error when too large for tile
Merge branch 'development'