Merge pull request #286 from svost/patch