Merge branch 'SP-mode'

Conflicts:
	main.py