changed add_derivate
Merge remote-tracking branch 'origin/newargs' into newargs