Merge pull request #368 from svost/patch-2