fixed more merge issues
Merge pull request #29 from schreuderjo/post-deletion

fixed more merge issues