Merge pull request #895 from valentinewallace/invoice-chanman-utility