Updated Javadoc
Merge branch 'master' of https://github.com/liisj/CHP