Merge pull request #32 from pamelawang/master

Javadoc