Merge pull request #289 from svost/patch