macro renaming
Merge branch 'master' of /home/jlmiao/parallel