Changes made by Vasil Yordanov (vasil.yordanov@telerik.com).