Merge pull request #21 from amcgowanca/7.x-1.x

Refactored, bug resolution and re-exported.