Reorganised charts to use just an options file specified by the user
Merge branch 'Export'