New pull request with fixed history

I created a new branch to make a clean commit history with cherry-pick.
This is the new branch, I cannot fix the old one (#268)
The content should be the same ;-)