deletion working comments
Merge branch 'master' into implement-votes