added scaling to 1
Merge branch 'develop'

added scaling