• makepgp.py modified