Tidy up.
Merge after updating README on github.