corrected shell for execution
use zsh instead of bash
use env command for executing zsh

- zsh is not always in /bin
Merge branch 'upstream'