Now supports any size! (TODO update doc)
Merge remote-tracking branch 'origin/master'