added javadoc comments
merge
merge
mergin
resolved merge conflicts
resolved merge conflicts