changed speed
Merge remote-tracking branch 'origin' into tiled