Changes made by Grzegorz Kożuchowski (vaderg@gmail.com).