Added javadocs
fixed merge conflict
Merge pull request #380 from cchan5/master

Added javadocs