Changes made by Todor Totev (todor.totev@telerik.local).