Merge pull request #890 from masahir0y/scp