Revert "Merge pull request #21 from davidkoh/master"

This reverts commit 811478792c5b6cc0ba963100da2a4531d51b4a81, reversing
changes made to 5a9634c823a25c61aee378f6f2685238b25e403c.
Merge pull request #26 from ajschumacher/fix_deletion_merge

Revert "Merge pull request #21 from davidkoh/master"