add output
mMerge branch 'develop-YuchaoZhou'
solve conflict
Fix two warnings: remove unused variable, modify a typo
Merge branch 'develop-JinSun'
add ctrl c