Changes made by Ivan Stefanov (inj.stefanov@gmail.com).