Merge pull request #36 from confpub/master

Update for ICPC, MSR, ICSE
Jo's last change