Updated to accomodate newer version of org-mode