Formatting, javadoc.
Merge branch 'origin/master'