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

repackaged