Merge pull request #378 from svost/master