allow for images of size not square
Merge branch 'tsn-mods'