Add support for key and name
Merge pull request #15 from cvuong/rewrite-login

Add support for key and name