Changes made by Mark Ruzinov (mark@ruzinov.com).