Re-exported and updated.
Merge pull request #23 from amcgowanca/7.x-1.x

Re-exported and updated.