Homec4science

rAKA/optimization
bugfixes/36-pretty…