Changed delete
Merge branch 'master' into alyssa