Merge pull request #361 from svost/master