Fixed conflicts with objects
Merge remote-tracking branch 'origin/master'

Conflicts:
	utils.py