Merge branch 'master' of https://github.com/dereklmc/ftp-client