Merge pull request #279 from svost/patch