Add secret key generation
Minor changes
Merge pull request #1 from pmorie/wip

Wip