Hi Gunnar. I'm still working on it; I think I'm going to provide a pull request this evening or tomorrow.
Sorry for the delay; like I said previously, I'm currently on a very tight schedule (I really would like to be able to shower when I move in next Saturday ). I try working on this in small sessions whenever possible.