more fixes for gpg format (issue #472)
Merge pull request #478 from kholia/gpg-more-fixes

more fixes for gpg format (issue #472)