Corrected formating faults in previous commit.
Corrected Javadoc contents and formatting
Merge pull request #1 from christoffer/username-password

Upgraded version to 1.1