Fixes #178 to some extent by updating the manual.
Merge branch 'master' of github.com:zedapp/zed