restructured
added deletes
Merge pull request #1 from danheidel/dan

Dan