resize
Merge https://github.com/minardi/dp-041-tse