Changes made by Nikolay Kichev (kichev.nikolay@gmail.com).