Merge pull request #11 from bbinet/gpg-fixes

2 small fixes regarding gpg