Fixed bug on basic auth retrival.
Merge branch 'test' into dev