Merge pull request #349 from liggitt/v7

Bump to v7