better integration with org-mode v1.3.0