Changes made by Jeliazko Jeliazkov (jsjeliazkov@gmail.com).