Added authentication
Merged conflicts