First Pierrick review
Merge pull request #181 from pbrunet/wpmvp14

My contrib