fixing small bug with scale
Merge branch 'develop' of github.com:IrisConstruct/iris into develop
Merge branch 'develop' of github.com:IrisConstruct/iris into develop
Merge branch 'develop' of github.com:IrisConstruct/iris into develop