Broken uncertainties
Bug fixes
Merge pull request #66 from MatthewJA/broken_uncertainties

Unbroken uncertainties.