1.0.4
Various optimisation.