Changes made by Maksim Goncharov (mag.dolphin@gmail.com).