Added Javadoc
Merge pull request #9 from thebohster/master

Updated javadoc