Update man page
Update README
Merge branch 'master' into debian-master