Added Javadoc
Merge pull request #6 from jsicree/dev

Added Javadoc