Changes made by Lyubomir Dokov (lyubomir.dokov@telerik.com).