Address ISLANDORA-977
Add the actual variables.
Merge pull request #13 from ruebot/7.x-ISLANDORA-977

Address ISLANDORA-977