* Integrate suggested changes by Vicente Salvador (thx!)