> Let me find some time to update my code and I'll send an update.

@cvandenthillart: Have you had a chance to have a look at this? I suggest that we merge this now and address any possible code changes in a subsequent update. Does that work for you?