Changes to classes.py
Merge remote branch 'origin'