fix-2 finish
Merge branch 'fix-2' into dev

Conflicts:
	app.py