Pull request for Issue #117