Merge pull request #556 from drkitty/fix-deletion

Fix deletion