Changes made by Alexander Kravchenko (alexkr@operamail.com).