fixed the flyweight
Merge remote-tracking branch 'origin/master' into untested

Conflicts:
	model.py