Line break removed
Fix javadoc entry
Fixed javadocs entry and prep for user name
Merge branch 'origin/master'