New version. Adapted to orgmode 8.0