Changes made by Penko Zhivanov (penko.zhivanov@gmail.com).