Changes made by Pavel Pavlov (pavel.pavlov@telerik.com).