PFS ISWG MOD's Update keys to current standards
Merge pull request #45 from mjmeans/pfs

PFS ISWG MOD's Update keys to current standards