Changes made by Thomas Mullaly (thomas.mullaly@telerik.com).