Addition of feature #82