Update Javadocs
Merge pull request #41 from pdpiech/master

Update Javadocs