Changes made by Kristian D. Dimitrov (kristiand.dimitrov@telerik.local).