Ok I will leave it for the time being. I am submitting a PR once again. If all is fine please merge it.