rAKA/master-stable

features/doc_energies