Fixed global.class to clear data on reset.
Merge origin/master