4th Commit

Updated source code and added javadoc