Changes made by Todor Yanev (yanev.tm@gmail.com).