#24 solution without wrapping
Merge commit '6ab20d79d528247f7819da2d7cce926da91633e5'