minor changes
Merge branch 'master' of github.com:lrhgit/tkt4140
Major changes conducted to improve plotting. Works well for r = 0.5, but for r<0.5 the solution seems to wrong...