re-renaming 2c...
pull from KONG; check if correct!
Merge branch 'master' of https://github.com/kschlesi/i2012paper