Tests passing.
Merge pull request #11 from willtp87/7.x

Tests passing.