source code merge process
Merge pull request #5 from zerdliu/process_merge

source code merge process