Merge pull request #291 from svost/patch