Implemented a 2-component keyset generator
Merge branch 'kg'