more changes by yinong
Merge branch 'master' of https://github.com/gkovacs/psetparty
yinong changes