Changes made by Ilian Ivanov (ilian_oven@abv.bg).