Changes made by Stoian Kirov (stoian.kiroff@gmail.com).