Changes made by Vladislav Dobrev (vladislavdd@gmail.com).