Merge pull request #812 from narfbg/develop-ftp

Improve the FTP library