Added bugged delete function
Merge remote-tracking branch 'origin/master'
Latest!
Refactor!