added new option, fixed javadoc
fixed javadoc