hopefully a fix for zsh on #25
Merge branch 'feature/zsh' into develop
Merge branch 'develop'