Added Javadoc and fixed typo
Merge pull request #1 from nikwen/javadoc

Merged #1