Merge pull request #136 from HenryJacques/pkinit_improvements