Yay! My first contribution to org-mode and Emacs! Thank you cleaning it up and making it part of the official branch! Regards, Claudiu.