Changes made by Kristian Dimitrov (kristian.dimitrov.sz@gmail.com).