added zoom function
Merge branch 'feature' into develop