Merge pull request #237 from svost/c4127