Changes made by Rayko Grozdanov (rayko.grozdanov@telerik.com).