stuff for Jordan
doc fix
Merge pull request #4 from willtp87/7.x

stuff for Jordan