Merge remote branch 'cloudant:fix-some-type-errors'

This closes #46

Signed-off-by: ILYA Khlopotov <iilyak@ca.ibm.com>