feature #32, new classed added