Fixed bug with scaling.
Merge remote-tracking branch 'upstream/master'
Merge pull request #54 from niklasborwell/master

Fixed bug with scaling.