Added scaling (correctly)

Next: integration and testing?????
Merge branch 'master' of https://github.com/PICASSAU/PICASSAU