Changes made by Georgi Yaramov (georgipyaramov@gmail.com).