Code cleanup
Add keyring support
Updated README