Changes made by Aleksandar Todorov (aleks.k.todorov@gmail.com).