Changes made by Hristo Borisov (hristo.borisov@telerik.com).