Staging
Seems that threading works with the simplest solution
Merge branch 'threading'

Conflicts:
	rest.py