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

repackaged