Make energy travel through tubes, not into container
Merge branch 'refs/heads/master' into gh-pages