Merge pull request #14 from mitchmac/7.x

7.x