Changes made by Ivan I. Ivanov (ivani.ivanov@telerik.local).