Merge pull request #39 from confpub/master

Updates on ICSE and ICPC