merge patRUShka's changes