Changes made by Nikolay Valchev (Nikolay.Valchev@telerik.com).