Changes made by Pavel Sotirov (p.sotirov@mail.bg).