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

Repackaged.