fixes for resubmission
Merge branch 'master' of https://github.com/mojones/AfterParty2