Added support to authentication with password
Fixed merge conflicts