Added option to encode key as base64
Merge branch 'encodeFilename'