#34 - javadocs added, some small modifications