recursion renaming
Merge branch 'master' of github.com:ITPNYU/ICM-2014