Changes made by Iliyan Hristov (iliqn408@abv.bg).