Merge pull request #7 from jordandukart/7.x

rsynsrynsf
prevent conflict
Merge pull request #6 from willtp87/7.x

shtnm