Fixes #1 and Fixes #2 + some additional small Javadoc patches
Merge pull request #3 from karianna/master

Fixes #1 and #2 + some Javadoc patches