Added last name
Added javadoc