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

Repackaged.