Merged in original changes on oh-my-zsh project