Fork from dwerne's code with little fix

We have prepared this release to be able to integrate it in other projects.
It contains an issue fixed with uppercase in the name of a header.