Pull request for Issue #191