Merging petRUShka's changes