UPGRADED to latest version of org-mode