further refinements
Merge pull request #67 from ajstanley/7.x

further refinements