Merge pull request #268 from TheBlueMatt/deletefix