#34 - javadocs added