Functionality added for Issue #22