moving from zsh to bash
Merge branch 'develop'