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

Final changes related to PKI