@timgraham really sorry for the delay. Got swamped with work and then started travelling. I would still want to finish this pull request. I will work on it next week, the change should actually be quite simple.