Adding zoom func, need to clear screen
Merge remote-tracking branch 'origin/master'