fixed d/dx issue (dfrac instead of frac)
Merge remote-tracking branch 'origin/master'