work on zoom function
Merge remote branch 'origin/master'