Merge pull request #302 from svost/patch