Pull request #547