Update urls, fix for zsh handling
Merge branch 'develop'