Close #69
Merge branch 'login-implement' into development