Changes made by neven dinev (dinev@telerik.local).