Merge pull request #283 from svost/patch