Alignement on David's work and correction

This is an alignement on david's version and correction to minor bug.
Introduction to orf format