Changes made by Denis Georgiev (d.georgiev.91@gmail.com).