Changes made by Bernard Faria (bernardxf@gmail.com).