Hi @aho,
Here there are the modifications given #84 (closed).
Let me know if you agree on merging it.
Cheers,
Núria