Merge branch 'DavidNg_Local'
Removing target file
Merge branch 'master' into DavidNg_Local
Modify make file for ivcon