Merge from oh_my_zsh branch