Replace class variables at the top-level
Merge pull request #1 from Yesware/class_vars_at_toplevel

Replace class variables at the top-level