Changes made by Недко недев (nedkouktc@gmail.com).