Correct the alpha and phi 's position as show in the formulations. While Zhou's code confused the two values totally and put them into all the wrong places.
Merge remote-tracking branch 'origin/master'