Core: Revised the initial version of code sent by Emma.
Merge pull request #2 from amcgowanca/7.x-dev

Core: Revised the initial version of code sent by Emma.