Changes made by Borislav Borisov (borislav.borisov.tues@gmail.com).