pr1
Merge branch 'master' into pr1

Conflicts:
	yes.c
Merge pull request #1 from odz/pr1

pr1