Merge pull request #275 from svost/patch