Develop

I don't know well what I'm doing, but I want to bring the new modifications from Panique to my fork.