Merge pull request #388 from svost/master