Merging pull request from dev branch to master branch. Added SFTP support.