ChangeLog  Tidied up and added some more information
Merge branch 'file_tidy' into develop