pr 2
Merge branch 'pr2'

Conflicts:
	comment
Merge branch 'master' of https://github.com/tigo-company/tmp