Changes made by Yasen Yankov (yasen.yankov@telerik.com).