Changes made by Svetozar Toskov (svetozar.toskov@telerik.com).