Changes made by Chavdar Tsvetkov (aftoafto@live.com).