Changes made by Stas Gerstas (newgerstas@gmail.com).