Dan changes
Merge branch 'exhaustion' of ssh://github.com/xdanx/le-cycling into exhaustion