Changes made by Zdravko Branzov (Zdravko.Branzov@telerik.com).