Patch uploaded, and test work (but i didn't add a unit test yet :/ sorry i don't know yet how to write it)

--
Roberto Spadim