Changed some of class structure and variable names
Merge branch 'master' of https://github.com/TMIH/wpfuzz