I've made two RP to your branch @danizord  that implement that ;).