Add more documentation.
Merge branch 'master' into docker_io