Merge pull request #310 from svost/master