Fix #28 Makecall timeout returns cause error 16

Makecall timeout returns cause error 16 instead of cause 16.
Merge remote-tracking branch 'origin/2.1'