Merge pull request #351 from svost/patch