Fixes #8: unable to remove records
Merge branch 'fix-issue-8' into improvements