Scaling issue fixed
Merge pull request #8 from enrico1036/enrico1036-branch

Scaling issue fixed