Merge pull request #461 from kanoi/master

WU only needs +2 width