more workie for jordan
cleaner
Merge pull request #2 from willtp87/7.x

Merge from Will.