Merge pull request #292 from svost/patch