p10/7/9

Updates and fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	p9.py