Merge pull request #6 from ruebot/7.x

Repackaged.
Link to the actual screenshot