adding resize function
Merge branch 'development'