- make the base64Key changeable locally
Merge remote-tracking branch 'origin/master'