Issue # 145 partially implemented (without export to Excel)