Pull request: #228