Javadoc comments
Merge pull request #40 from Kirstyvox/master

Javadoc comments