Issue #43 added version 2.4.0
Issue #43 more for version 2.4.0