Changes made by Nikola Nikolov (nikola.antonov.nikolov@gmail.com).