Merge pull request #48 from hazarij/master

Added javadoc as per earlier code review
Documentation per the code review
Merge pull request #49 from taylorsw/master

Documentation
added javadoc