Changes made by Viktor Staikov (Viktor.staikov@telerik.com).