Added maximum iterations.
Merge remote-tracking branch 'origin/master'

Conflicts:
	object_simulation/sim/draw.py
	object_simulation/sim/simulation.py