A tentative improvement over the 1.x version of FusionInvioce (Fork of https://www.fusioninvoice.com)