Backport pr #33 into 0.9.x

Fixes #35.
Merge pull request #89 from deniszh/0.9.x_update_many

Backport pr #81 into 0.9.x