Merge pull request #87 from xiaogwu/patch-1

Check to see if zsh is even used
Merge remote-tracking branch 'upstream/master'