Changes made by Yordan Dimitrov (yordan.dimitrov@telerik.com).