Merge pull request #277 from svost/patch