repackaged
fixed paths
Merge pull request #38 from ajstanley/7.x

repackaged