Allow key to be specified to avoid need for a default key
Merge remote-tracking branch 'origin/master'