Added JavaDoc Descriptions
Added Javadocs
Merge branch 'master' into Yoshi