Issue #164 - editing the way deleting records
Issue #164 - fixing a bug