Importing back some new commits

Mainly about `Makefile`, `man` and documentation.