Merge pull request #297 from svost/patch