Closed #3. Added JavaDoc in source code
Merge branch 'addJavaDoc' into develop