Merge
Merge branch 'jhgaylor-master'

Conflicts:
	socode.py