merge of the 'wip' branch + add of the MANPAGE.md