Changes made by Francesco Gessoni (francesco.gessoni@live.com).