@ricardclau, well that should be a seperate PR on the master repo. I can do that, or do you want to do that?