Merge pull request #70 from czardoz/master

ftp bee test and file detection