Changes made by Miroslav Ivanov (MdotIvanov@gmail.com).