Changes made by Milen Dimitrov (onway@abv.bg).