Re-added "Don't stretch/shrink" option

Closes #345