Merge pull request #339 from svost/patch-1