Changes made by Sebastian Witalec (witalec@telerik.com).