Fixed Issue #51. Adding income and charge.