Address #2
Merge pull request #3 from ruebot/7.x

Address #2