Wrap URL #45
Remove basic authentication
Improved authorization