Work in progress
Merge branch 'thermo2' of github.com:leeping/forcebalance into thermo2