Changes made by Jordan Ilchev (jordan.ilchev@gmail.com).