Some minor updates on repository
Merge branch 'development' into Issue15_ExcelExport
I got my first Excel file!