Merge pull request #376 from rjynn/master

created javadocs and cleaned up code not needed
Merge remote-tracking branch 'upstream/master'