Add debug for class vars
Merge branch 'master' into debug