1. uhm, changed and added according to my knowledge

    Closed
    #171646891 23 6 5 0