Stop using evil class variables.
Add a test for the global variable fix.
Merge pull request #8 from mschulkind/master

Stop using evil class variables and breaking things.