Merge remote branch 'cloudant:77984-fixup'

This closes #80

Signed-off-by: ILYA Khlopotov <iilyak@apache.org>