Please check it 

Maybe there was something  wrong with the commits order. I checked it and it works. Please make me a favor and try it again OK? Anyway the working code is in the pejot/develop branch if you want to investigate more.
Cheers.