Sorry if it is not correct to act like this (did I ever tell how n00b I am when it comes to git ?). So I wanted to /amend/ your patch to add some refactoring to it. I hope this will not hurt :/ /Xavier