@samsonasik Perhaps i could incorporate your PR into this one ?