Merge pull request #6 from taka-wang/login_refine

Login refine