Fixed a bug in deleting records
Merge remote-tracking branch 'origin/master'