Fixed the excel problem
Merge remote-tracking branch 'origin/NumpyMigration' into NumpyMigration