changed parameter name
changed parameter name
added comments
added comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_app.py