update destroy with delete
Merge branch 'master' into tony