Added headers with info, 1 minor modification
Adapt the coding to a common set of conventions (see conventions.markdown)