More Invoice - Fixes #19