Fixing issue #189. Add comment property for charge.