Pull Request for Issue 219