various changes by staphany
Merge branch 'master' of https://github.com/gkovacs/psetparty