Merge branch 'manpage' into version
Add support for "version" flag
Merge branch 'version'