ssh auto connect
Merge branch 'develop'