Pull request for Issue #123