Changes made by Ivan Yordanov (jordanov.ivan@gmail.com).