Update for javadoc at 09/17/2014