Add some scale conditions
Merge pull request #44 from kalbermattenm/scale

Add some scale conditions