Changes made by Valentin Stoychev (valentin.stoychev@telerik.com).