Merge pull request #16 from wangqj/master

SCB-1325 Refactoring the delete function