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

repackaged