Merge pull request #287 from svost/patch