Merge pull request #272 from svost/V668