merge scale and rotate
Merge pull request #14 from Robinisabadguy/master

merge scale and rotate