Merge pull request #271 from svost/patch