[Quick Fix]
Update Javadocs
[Test Fix]
[Test Fix]
Merge pull request #56 from jmpascal/master

[QA Fix]