Added optional upper and lower limits on scaling

Off by default