Merge pull request #367 from svost/patch-1