Merge pull request #276 from svost/patch