Merge pull request #293 from svost/patch