Merge pull request #296 from svost/patch