FIXME moved to #26
Minor fix
Manpage update