Improve manpage
Merge branch 'master' into deb