Moving labels, second version.

The labels move with the lines but don't move out of the canvas TO THE RIGHT and TO THE TOP.
Merge branch 'master' into gh-pages