Merge develop into master

Feature ssh-copy-id has been finished and tested