Updated man pages
Merge pull request #406 from hintjens/master

Updated man pages