Changes made by Ivan Spasov (ivan.spasov@telerik.com).