added javadoc comments and removed scale
Edited Javadoc Comment

Added to see if this will automatically push
Merge remote-tracking branch 'upstream/master'