Add keyring to start
Merge branch 'keyring'