Merge pull request #5 from tud27837/master

Update
Added comments to create Javadoc.
Merge pull request #7 from tud27837/ZackBranch

Zack branch