repackaged
Merge pull request #3 from ajstanley/7.x

repackaged