Repackaged.
Merge pull request #34 from ruebot/7.x

Repackaged.