Final changes related to PKI
Merge pull request #29 from jaypipes/working

Final changes related to PKI