Update o.py
Merge branch 'zac9/patch-2'