Only scale and crop when necessary
Merge pull request #23 from storehouse/fix-scale-crop-conditions

Fix crop and scale conditions