Pull request for: #469