Pull request for Issue #22