merged feature/authentication