Integration into openpgp-keychain:master

As requested :-) 

Cheers, 

Marcel