Changes made by Georgi Stavrev (georgi.stavrev@telerik.com).