Pull Request for Issue #68