Pull Request #888