Changes made by Alex Kravchenko (akrav4@gmail.com).