Fixed AmazonS3 keys method

The method didn't care about "directory" option