Code cleaned, --help rewritten and -w, -l options removed.
Code cleaned, --help rewritten and -w, -l options removed.

inveniosoftware/invenio,inveniosoftware/invenio,tiborsimko/invenio,tiborsimko/invenio