Changed package
repackaged
Merge pull request #36 from ajstanley/7.x

Repackaged