Added JavaDoc and a new Date nextShipment