some changes

hi
Merge remote-tracking branch 'origin/master'

Conflicts:
	pam.txt