Merge pull request #836 from valentinewallace/invoice-features-methods