added javadoc
added get methods