Changes made by Delyan Nikolov (delyan.nikolov.1992@gmail.com).