Merge pull request #223 from svost/c4512