cico - 2011-11-18

Patch for src/callbacks.c and src/math_functions.c