Changes made by Vanco Ordanoski (vanco.ordanoski@gmail.com).