3.1.1 jaavdoc upgrade