Fixing offset classes
Merge remote-tracking branch 'origin/v2'