Fixed Issue #84. Enhancing charge functions.