Merge pull request #1619 from lurch/patch-2

Add selection, deletion, etc.