Preparing for merge continues

Yet another javadoc