Merge pull request #295 from svost/patch