Updated to work with multisites
Another quick fix
Code review
one more update
Merge pull request #42 from jonathangreen/7.x-fix-multisite

7.x fix multisite