Issue #49 New refactoring - convert line and block comments to javadocs

Added comments in the code on how to solve some problems for this issue.