FIX and MERGE with MPogoda
zsh integration