Full 0.9.6

Not sure what happened but minimised file missing from previous merge