fix error

fix error
Add delete function

Add delete function
Merge branch 'DavidNg_Local'
Merge branch 'master' into DavidNg_Local