Update .zshenv
Update .zprofile
Merge remote-tracking branch 'upstream/master'