Pull request for: #543