Incorporating the changes proposed by fbacchella.