Merge branch 'master' of https://github.com/nickyska/shepherd
add exception when login failed
Merge remote-tracking branch 'origin/master'