Javadoc Style
Explicit Initialization
Merge remote-tracking branch 'origin/master'