Merge pull request #78 from markpeek/markpeek-keypair

Add support for keypairs