Patch 5

I am afraid it is quite messy...
Use either commit 64f460478b3b514cafe017142a3da83843ede88e
Or this one (combining b68a186cad36ff4af757ced34ddcffa843535758 and 2477cd4159c3402d3c1d35ecb448f3624ba7460c)
Both should be the same...
Sorry for this, I had a problem (error 404) this morning