Javadocs
Merge pull request #11 from conclarke/master

Javadocs