Changes made by Svetoslav Petsov (Svetoslav.Petsov@telerik.com).