Merge pull request #280 from svost/patch