added more variables in order to make this more usable to others.
Merge https://github.com/Midacts/clamav