WIP on PerseusDL/perseids_docs#54 and PerseusDL/perseids_docs#91