minor updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/latex/model_description.tex