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

Repackaged.