If only it were written in emacs-lisp, it would have been much easier to adapt to newer releases of Org. Fabrice