add username option #1
make username and password work. #1
merge conflict