Merging Andrei's FTP changes

Pulled from FTP client and committing to GitHub