Pull request #34