better convergence
Merge branch 'master' of https://github.com/jcchin/Hyperloop
interim...
merged jeffs stuff