Changes made by Tsvetomir Todorov (tsvetomiry.todorov@telerik.local).