Merge pull request #238 from svost/c4267