fixed streching
Merge branch 'develop'