Changed class variables to instance variables.
A few other fixes to whitelist.
Bumped version.