Modifications proposed by Rob Komar. Thanks for your contribution !