Changes made by Iliya Rachev (rachev.id@gmail.com).