Updated such that 'make test' passes.
Merge branch 'master' of github.com:skx/lumail