Fixing man page
Merge branch 'master' into debian
Some fixes
Fixing some entries in control
Indenting list