Getting the C callbacks working.
Merge remote-tracking branch 'upstream/master'