Major bug fix in second order calc
Merge remote-tracking branch 'origin/master'