replace pow by ** to please Sympy
Merge remote-tracking branch 'origin/master'