merge
Merge remote branch 'upstream/master' into current
add delete function
Merge remote branch 'upstream/master'
Merge pull request #6 from lucknessbuaa/master

add the delete function