Changes made by Doncho Minkov (Doncho.Minkov@telerik.com).