Changes made by Tihomir Petrov (Tihomir.Petrov@telerik.com).